Merge from origin/emacs-29
authorMichael Albinus <michael.albinus@gmx.de>
Sun, 28 Jan 2024 10:51:51 +0000 (11:51 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sun, 28 Jan 2024 10:51:51 +0000 (11:51 +0100)
commit6ebd5aa33765d6d3ffec96f9965d004ad539098e
treeed15e7889c450aef97575f2b204abac4b64c5ef2
parentaf10fe49fbfcdbe3100b9fdbede3750eb2506930
parente11c9f9c6e843779c4b69097490dd78de522a79d
Merge from origin/emacs-29

e11c9f9c6e8 Handle wrong login program in Tramp

# Conflicts:
# lisp/net/tramp-sh.el
lisp/net/tramp-sh.el